R2.1.0 - #62

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In @.github/workflows/release.yml:
- Line 25: Pin every listed GitHub Action to a full 40-character commit SHA
instead of a mutable tag, preserving the action release name in a trailing
comment. Apply this to .github/workflows/release.yml lines 25-25, 31-31, 37-37,
and 164-164, and .github/workflows/test.yml line 29-29.
- Line 140: Update the release workflow step following the Flutter build command
to persist the generated files from build/app/outputs/symbols in protected
long-term storage before the workflow ends, alongside the existing APK artifacts
without changing the obfuscation build configuration.
- Around line 127-130: Extend the release-signing validation block in the
workflow to check KEYSTORE_BASE64, KEY_STORE_PASSWORD, KEY_ALIAS, and
KEY_PASSWORD before the build. Fail immediately with a clear configuration error
if any required secret is empty, preventing the Gradle release task from
proceeding with debug signing.

In @.github/workflows/test.yml:
- Around line 68-69: Remove the empty line immediately following the slug entry
in the workflow YAML, leaving the slug configuration and surrounding formatting
otherwise unchanged.
- Around line 42-44: Update the condition guarding the flutter pub get step to
use steps.flutter-action.outputs.PUB-CACHE-HIT rather than CACHE-HIT, so
dependency resolution runs when the project pub cache was not restored while
preserving the existing working-directory and command.

In `@workout-logger/android/app/build.gradle.kts`:
- Line 14: Align Android SDK targets with the pinned AGP 8.11.1 by changing
compileSdk and targetSdk in the Android build configuration to 36. Do not target
API 37 unless you also upgrade the AGP version in the settings plugin
declaration and the Gradle wrapper to their compatible versions.
- Around line 2-3: Update the properties-loading logic to use a scoped stream
around keyPropertiesFile.inputStream(), ensuring the stream closes after
Properties.load completes, and remove the unused FileInputStream import.
- Around line 44-48: The release signing setup around keystorePath, storePass,
alias, and keyPass must fail closed when any signing input is missing or empty,
including validating the decoded keystore file before building. Treat blank
environment variables as unavailable, require non-empty values for all four
inputs, and only allow the debug signing fallback when an explicit local-only
property is enabled; do not infer local mode from missing environment variables.

In `@workout-logger/android/gradle.properties`:
- Around line 4-7: Keep the Android toolchain consistent with the built-in
Kotlin/new DSL flags: either upgrade Flutter to 3.47+ and AGP to 9+ across
workout-logger/android/gradle.properties lines 4-7 and
workout-logger/android/app/build.gradle.kts lines 5-10 and 22-25, or disable
those flags and retain the existing legacy Kotlin Gradle Plugin configuration at
all listed sites.

In `@workout-logger/lib/screens/widgets/floating_nav_bar.dart`:
- Around line 562-580: Add a badgeColor field to FloatingNavBarTheme and update
the hasBadge indicator in the floating navigation bar to use that theme value,
falling back to cs.error when unset instead of hardcoding Colors.red. Preserve
the existing chipBg border styling.
- Around line 263-285: Update the bottom padding calculation in the floating
navigation bar to use MediaQuery.paddingOf(context) and add bottomPad to
theme.bottomMargin rather than choosing between them. Preserve the documented
padding.bottom + theme.navHeight + theme.bottomMargin spacing across devices.
- Around line 697-717: The _handleScrollNotification method currently responds
to nested and horizontal scroll updates. Restrict its ScrollUpdateNotification
handling to notifications with depth 0 and vertical axis, while preserving the
existing visibility threshold and top-of-scroll behavior for accepted
notifications.
- Around line 470-479: Update the tab widget’s Semantics/GestureDetector
interaction so it exposes an explicit onTap semantics action and supports
keyboard and switch-access focus and activation. Prefer replacing
GestureDetector with InkWell while preserving the existing haptic feedback and
widget.onTap behavior; if InkWell’s splash is unsuitable for the glassmorphic
chip, retain GestureDetector and add a Semantics onTap plus a Focus wrapper.
- Around line 725-763: Wrap the animated nav bar subtree beginning with
AnimatedSlide in Positioned(left: 0, right: 0, bottom: 0) within the Stack,
keeping the existing AnimatedSlide, AnimatedOpacity, IgnorePointer, and
FloatingNavBar behavior unchanged. This must let FloatingNavBar shrink-wrap to
the pill height so slide offsets are relative to the nav bar rather than the
full Scaffold body.

In `@workout-logger/lib/screens/widgets/rf_dialogs.dart`:
- Around line 20-41: Update the RFSnackBarType.success and RFSnackBarType.error
branches to use WCAG AA-compliant foreground/background pairs: switch success to
a dark foreground on AppColors.success, and darken the error
foreground/background combination as needed. Replace the existing inaccurate
contrast comments with comments reflecting the validated ratios, while leaving
warning and info unchanged.

In `@workout-logger/lib/screens/widgets/rf_widgets.dart`:
- Around line 904-926: Update RFTextField to use an int? maxLines while
preserving the default of 1, and add an optional FocusNode parameter. Reuse the
supplied focus node for the TextField; otherwise create and retain an internal
node, disposing it only when RFTextField created it.

In `@workout-logger/lib/screens/widgets/routine_creator.dart`:
- Around line 431-435: Update the routine save error handling around the mounted
context.showRFSnackBar call to avoid interpolating the raw exception into the
user-facing message. Log the exception with debugPrint, then show a generic
save-failure SnackBar message, matching the pattern used in
edit_workout_session_screen.dart.
- Line 147: Move the “Add Exercises” action from the item list into the
ReorderableListView.builder footer. Update itemCount to represent only
_selectedIds, remove the itemBuilder branch that renders the button at
_selectedIds.length, and adjust the reorder bounds guard to match the reduced
item range.

In `@workout-logger/lib/services/health_connect_service.dart`:
- Around line 65-73: Update _getConnector to cache the in-flight connector
creation Future so concurrent callers await the same HealthConnector.create
operation. Return the resolved connector for every caller, and clear the cached
Future only when initialization fails; preserve the existing timeout and debug
logging behavior.
- Around line 328-334: Store an hcClientRecordVersion field on WorkoutSession,
initialize it for new sessions, and increment it in
WorkoutProvider.updateWorkoutSession whenever any Health Connect-recordable
field changes. Use the current version when constructing the Health Connect
record metadata in the sync flow, while preserving hcSyncedAt solely as the
synchronization marker.

In `@workout-logger/scripts/build_release.py`:
- Around line 33-37: Update the subprocess invocation in the release-build flow
to pass the Flutter command as an argument list rather than a shell-parsed
string, and remove the shell=True usage from subprocess.run. Preserve the
existing environment and result-code propagation through sys.exit.

In `@workout-logger/test/debug_log_buffer_test.dart`:
- Around line 25-56: Update the affected tests around DebugLogBuffer.attach and
buffer.clear to store each callback passed to buffer.addListener, then remove
those same callbacks with buffer.removeListener during test cleanup. Ensure
listener cleanup runs for both tests and preserves their existing assertions.

In `@workout-logger/test/gemini_context_builder_test.dart`:
- Around line 35-86: The test exposes incorrect singular grammar in
GeminiContextBuilder.buildWeeklyInsightsContext. Update the formatter to use
“session” for a count of one and “set” for a single set, while preserving plural
forms for larger counts; then change the corresponding test expectations from “1
sessions” and “1×sets” to “1 session” and “1×set”.

In `@workout-logger/test/screens/edit_workout_session_screen_test.dart`:
- Around line 54-61: Update the add-set and delete-set assertions in the workout
session tests to require exactly one close-icon change per tap, replacing the
greater-than comparison with an assertion that the updated count equals the
initial count plus one and applying the corresponding minus-one assertion to the
delete flow.

In `@workout-logger/test/screens/heart_rate_detail_screen_test.dart`:
- Around line 18-23: Update the granularity-control assertion in the heart rate
detail screen test to require both `Day` and `Week` controls, replacing the
combined OR condition with separate expectations for each text.

In `@workout-logger/test/screens/history_screen_test.dart`:
- Around line 35-40: Replace the broad text searches in the empty-history
assertion with an exact empty-state label or dedicated widget key from the
history screen. Update the assertion around the empty-history test so it only
passes when that specific indicator is present.

In `@workout-logger/test/screens/programs/programs_screens_test.dart`:
- Around line 46-76: Strengthen the interaction tests with postcondition
assertions: in
workout-logger/test/screens/programs/programs_screens_test.dart:46-76, assert
the successful validation result after tapping Validate; in
workout-logger/test/screens/widgets/routine_creator_test.dart:26-36, require an
available exercise option and assert the selected exercise or saved routine
exists; in workout-logger/test/screens/widgets/targets_tab_test.dart:51-60,
assert a stable identifier for target_1, such as its exact exercise label or
widget key.

In `@workout-logger/test/screens/widgets/editable_exercise_card_full_test.dart`:
- Around line 21-31: Replace the consecutive DateTime.now() values in the
EditableSet fixtures within EditableExerciseCard with fixed, distinct timestamp
values, ensuring each sibling set has a unique deterministic ValueKey.
- Around line 63-68: Make both required test interactions fail when unavailable:
in workout-logger/test/screens/widgets/editable_exercise_card_full_test.dart
lines 63-68, assert the “+ Add Set” finder with findsOneWidget before tapping
it, then retain the setAdded assertion; in
workout-logger/test/screens/ai_coach_screen_full_test.dart lines 72-76,
configure input so the send control is enabled, assert the send icon exists, and
tap it without conditionally skipping the action.

In `@workout-logger/test/screens/widgets/health_cards_test.dart`:
- Around line 132-135: Update the card interaction tests around SleepHrCard and
HeartRateCard to assert their actual outcomes, not only tester.takeException().
After tapping SleepHrCard, verify its expected sheet is displayed; after tapping
HeartRateCard, verify navigation reaches the expected destination screen. Retain
the exception checks only as supplementary assertions.

In `@workout-logger/test/screens/widgets/health_widgets_test.dart`:
- Around line 74-95: Extend the HealthDetailShell test around the existing
currentG and onGranularityChanged setup to tap an alternate granularity option,
then assert that currentG changes from HealthGranularity.day to the selected
value. Keep the existing rendering and exception assertions intact.

In `@workout-logger/test/screens/widgets/workout_hr_section_test.dart`:
- Around line 75-78: Update the test around WorkoutHrSection to assert a
user-visible heart-rate statistic derived from analysis, such as the expected
average or peak BPM, in addition to verifying the widget exists. Use the test’s
existing analysis data and appropriate finder or text assertion so the test
detects missing computed values.

In `@workout-logger/test/screens/workout_flow_screen_full_test.dart`:
- Around line 44-53: Strengthen the workout-flow scenarios in
workout-logger/test/screens/workout_flow_screen_full_test.dart: lines 44-53 must
seed an exercise, require LOG SET, and verify the set was logged; lines 73-82
must likewise require and verify logging in the routine-backed flow; lines
110-118 must assert an observable deload-specific target or configuration
instead of only checking WorkoutFlowScreen visibility.

In `@workout-logger/test/services/health_connect_service_test.dart`:
- Around line 140-156: Update the test around HealthConnectService.isAvailable
to use a successful delayed platform response after 200ms and expect available
to be true, verifying the delayed success path within the deadline. If the null
response must remain, rename the test to describe unavailable-platform behavior
instead.

In `@workout-logger/test/test_utils/test_harness.dart`:
- Around line 82-86: Update the teardown callback registered by addTearDown to
be async and await tester.binding.setSurfaceSize(null), while preserving the
existing physical-size and device-pixel-ratio resets.

In `@workout-logger/test/test_utils/test_robot.dart`:
- Line 16: Update the TestRobot constructor to be const, preserving its existing
tester initialization and final-field behavior.

In `@workout-logger/test/userflow_history_and_session_details_test.dart`:
- Around line 73-75: Update the test setup around tester.view.devicePixelRatio
to register tester.view.resetDevicePixelRatio with addTearDown alongside
resetPhysicalSize, ensuring the binding restores both view properties after the
test.

In `@workout-logger/test/userflow_program_design_and_generator_test.dart`:
- Around line 55-67: Make the required UI interactions and outcome assertions
mandatory across the user-flow tests: in
workout-logger/test/userflow_program_design_and_generator_test.dart#L55-L67,
require both TextField controls and Save Program, then verify the entered
program persisted; at `#L70-L106`, load and open the program created through the
UI instead of directly saving sampleProgram; at `#L120-L135`, require the
suggestion and generate controls and assert the expected API-configuration
result. In workout-logger/test/userflow_screens_sweep_test.dart#L149-L163,
assert the required field and actions before invoking the sweep helper. In
workout-logger/test/userflow_targets_and_muscle_sheets_full_test.dart#L138-L154,
assert the required builder controls and verify a persisted or rendered result
after saving.